Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

CI/Spack/CMake updates #357

Merged
merged 9 commits into from
Apr 10, 2024
Merged

CI/Spack/CMake updates #357

merged 9 commits into from
Apr 10, 2024

Conversation

rbberger
Copy link
Collaborator

PR Summary

  • adds addtional testing for CPU kokkos variants
  • adds test for both C++14 and C++17 Kokkos
  • cleans up dependencies for kokkos and kokkos-kernels
  • adds a shared variant which is off by default (as before)
  • fixes a CI bug during dev-build on main

PR Checklist

  • Adds a test for any bugs fixed. Adds tests for new features.
  • Format your changes by using the make format command after configuring with cmake.
  • Document any new features, update documentation for changes made.
  • Make sure the copyright notice on any files you modified is up to date.
  • After creating a pull request, note it in the CHANGELOG.md file.
  • LANL employees: make sure tests pass both on the github CI and on the Darwin CI

If preparing for a new release, in addition please check the following:

  • Update the version in cmake.
  • Move the changes in the CHANGELOG.md file under a new header for the new release, and reset the categories.

@rbberger
Copy link
Collaborator Author

@jhp this will create a minor conflict with #356

Yurlungur
Yurlungur approved these changes Apr 10, 2024
View reviewed changes
Copy link
Collaborator

@Yurlungur Yurlungur left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM. Please add this to the changelog as it's probably worth documenting that we support C++17 for newer Kokkos at this juncture.

CMakeLists.txt Show resolved Hide resolved
@jhp-lanl
Copy link
Collaborator

@jhp this will create a minor conflict with #356

If you want, you can merge first and I'll resolve the conflict

@rbberger rbberger merged commit ee64411 into main Apr 10, 2024
4 checks passed
@rbberger rbberger deleted the ci_spack_cmake_updates branch April 10, 2024 21:13
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Yurlungur Yurlungur Yurlungur approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@rbberger @jhp-lanl @Yurlungur